Extract secondary action hooks and components from MoneyReportHeader by TMisiukiewicz · Pull Request #87361 · Expensify/App

TMisiukiewicz · 2026-04-08T11:19:24Z

Explanation of Change

MoneyReportHeader had grown to ~2448 lines, mixing rendering logic with business logic for hold menus, primary actions, expense actions, and selection mode. This PR extracts that logic into focused hooks and components:

useReportPrimaryAction — replaces the inline primary action derivation; removes animation knowledge from getReportPrimaryAction which now returns a plain value
useExpenseActions — owns all secondary expense action callbacks (hold, unhold, etc.); receives isReportInSearch as a prop instead of hardcoding false
useTransactionThreadReport — fetches the transaction thread report internally via useOnyx instead of requiring callers to pass it down
ActionsBar — renders sub-components directly; no longer accepts ReactNode props, eliminating the pattern that forced parent re-renders
MoneyReportHeaderHoldMenu — extracted with an early-return guard so the heavy hold menu tree is never evaluated unless needed
Dead code removed: isSelectionModePaymentRef, unused selectedTransactionIDs, and the clearSelectedTransactions callback that was duplicated in the wrong scope

The net result is MoneyReportHeader going from ~2448 lines to ~298 lines, with action logic owned by the hooks that have the right data access.

Fixed Issues

$ #87937
PROPOSAL:

Tests

Open expense report with single transaction
Press "More" dropdown
Verify the dropdown opened
Tap each action and verify it works, including:

Export sub-menu opens
Download PDF - modal opens

Go to Search
Select multiple expenses from same report
Verify selection dropdown appears with correct actions

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

…sBar

…port-header-actions

…portPrimaryAction

codecov · 2026-04-08T11:28:03Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
...ReportHeaderPrimaryAction/ApprovePrimaryAction.tsx	`0.00% <ø> (ø)`
...oneyReportHeaderPrimaryAction/PayPrimaryAction.tsx	`0.00% <ø> (ø)`
...yReportHeaderPrimaryAction/SubmitPrimaryAction.tsx	`0.00% <ø> (ø)`
src/libs/ReportPrimaryActionUtils.ts	`92.79% <ø> (+0.75%)`	⬆️
...omponents/MoneyReportHeaderPrimaryAction/index.tsx	`5.55% <0.00%> (ø)`
src/components/PaymentAnimationsContext.tsx	`25.00% <25.00%> (ø)`
src/hooks/useTransactionThreadReport.ts	`0.00% <0.00%> (ø)`
src/components/MoneyReportHeader.tsx	`0.00% <0.00%> (ø)`
src/hooks/useReportPrimaryAction.ts	`0.00% <0.00%> (ø)`
src/components/MoneyReportHeaderActions/index.tsx	`0.00% <0.00%> (ø)`
... and 6 more
... and 29 files with indirect coverage changes

TMisiukiewicz · 2026-04-08T12:27:55Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 20ffd04e53

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

…port-header-actions

abzokhattab · 2026-04-14T15:11:18Z

Sorry for the recurrent review comments ... the changes are quite big so it's not easy to tackle in one go 😆

…port-header-actions # Conflicts: # src/components/MoneyReportHeader.tsx

TMisiukiewicz · 2026-04-15T08:55:07Z

@abzokhattab I think i resolved all the comments 😮‍💨

abzokhattab · 2026-04-15T10:41:19Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Screen.Recording.2026-04-13.at.23.23.09.mov

Android: mWeb Chrome

Screen.Recording.2026-04-13.at.23.29.37.mov

iOS: HybridApp

Screen.Recording.2026-04-13.at.23.25.50.mov

iOS: mWeb Safari

Screen.Recording.2026-04-13.at.23.28.05.mov

MacOS: Chrome / Safari

Screen.Recording.2026-04-13.at.23.17.58.mov

abzokhattab

LGTM 🚀🚀

… to useLifecycleActions

github-actions · 2026-04-15T14:48:14Z

🚧 @rlinoz has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-04-15T14:52:52Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #87361.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-1d7d446-d10f585-86d3f2457de6cd2aa154228b2875e190c01d12d2/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-1d7d446-d10f585-766d70d1b27189c417c8b10f9312027b4df74edd/index.html

Web 🕸️
https://87361.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-15T15:00:05Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2026-04-16T03:57:08Z

🚀 Deployed to staging by https://github.com/rlinoz in version: 9.3.60-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-16T03:58:28Z

No help site changes are required for this PR.

This is a pure internal refactoring that extracts MoneyReportHeader.tsx (~2448 → ~298 lines) into focused hooks and subcomponents. There are no user-facing changes — no new features, UI labels, settings, or behavioral differences that would affect documentation under docs/articles.

lanitochka17 · 2026-04-16T11:48:23Z

Deploy Blocker ##88098 was identified to be related to this PR.

OSBotify · 2026-04-21T11:11:03Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.3.60-22 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

TMisiukiewicz added 11 commits April 7, 2026 16:15

initial refactor of secondary actions

edcc094

Extract MoneyReportHeaderHoldMenu gate with early return

caee100

Deduplicate types, extract useTransactionThreadReport, wire up Action…

30f290d

…sBar

ActionsBar renders sub-components directly, no ReactNode props

790214c

Merge remote-tracking branch 'origin/main' into perf/extract-money-re…

1ad3d28

…port-header-actions

Collapse ActionsBar into index, adopt upstream modals context

07205df

cleanup MoneyReportHeader

ec34c1f

Extract useReportPrimaryAction, remove animation knowledge from getRe…

3e9c1ec

…portPrimaryAction

Remove dead isSelectionModePaymentRef and unused selectedTransactionIDs

2361cab

Restore clearSelectedTransactions and hold menu onConfirm callbacks

e81ea4c

Pass isReportInSearch to useExpenseActions instead of hardcoding false

2b49674

melvin-bot Bot assigned TMisiukiewicz Apr 8, 2026

update MoneyReportHeaderActions

926e9be

adhorodyski reviewed Apr 8, 2026

View reviewed changes

Comment thread src/components/MoneyReportHeaderActions/index.tsx Outdated

adhorodyski reviewed Apr 8, 2026

View reviewed changes

Comment thread src/components/MoneyReportHeaderActions/index.tsx Outdated

updateMoneyReportHeaderActions

e74d1a7

adhorodyski reviewed Apr 8, 2026

View reviewed changes

Comment thread src/components/MoneyReportHeaderActions/index.tsx

TMisiukiewicz added 4 commits April 8, 2026 13:43

create animation context

f20ccf4

Replace modal handler props with direct context consumption

0228a9e

prettier

96b9eac

Rename shouldShow booleans to descriptive hasX/isX naming

d7841e4

TMisiukiewicz force-pushed the perf/extract-money-report-header-actions branch from a1ee5b8 to d7841e4 Compare April 8, 2026 12:18

Replace deprecated MutableRefObject with RefObject

20ffd04

chatgpt-codex-connector Bot reviewed Apr 8, 2026

View reviewed changes

Comment thread src/components/MoneyReportHeaderActions/MoneyReportHeaderSelectionDropdown.tsx Outdated

Comment thread src/components/MoneyReportHeaderActions/MoneyReportHeaderSelectionDropdown.tsx Outdated

Comment thread src/hooks/useExpenseActions.ts

TMisiukiewicz added 3 commits April 8, 2026 15:05

Fix isOnSearch, backTo route, and missing duplicate expense guards

df29a4b

Merge remote-tracking branch 'origin/main' into perf/extract-money-re…

7275d98

…port-header-actions

Merge remote-tracking branch 'origin/main' into perf/extract-money-re…

a24ee65

…port-header-actions

TMisiukiewicz force-pushed the perf/extract-money-report-header-actions branch from bf99903 to a24ee65 Compare April 9, 2026 06:11

abzokhattab reviewed Apr 14, 2026

View reviewed changes

Comment thread src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx

abzokhattab reviewed Apr 14, 2026

View reviewed changes

Comment thread src/components/MoneyReportHeaderActions/MoneyReportHeaderSelectionDropdown.tsx Outdated

abzokhattab reviewed Apr 14, 2026

View reviewed changes

Comment thread src/components/MoneyReportHeaderActions/index.tsx

abzokhattab reviewed Apr 14, 2026

View reviewed changes

Comment thread src/components/MoneyReportHeaderActions/index.tsx Outdated

mountiny mentioned this pull request Apr 15, 2026

[Due for payment 2026-04-28] [$250] Refactor: extract MoneyReportHeader actions into hooks and components #87937

Open

TMisiukiewicz added 3 commits April 15, 2026 09:30

Merge remote-tracking branch 'origin/main' into perf/extract-money-re…

17c3333

…port-header-actions # Conflicts: # src/components/MoneyReportHeader.tsx

remove non-reimbursable payment modal logic deleted on main

87d8edc

address PR review comments

d915471

abzokhattab approved these changes Apr 15, 2026

View reviewed changes

rlinoz requested changes Apr 15, 2026

View reviewed changes

Comment thread src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx

Comment thread src/hooks/useLifecycleActions.tsx

Add isAccountLocked guard to secondary actions payment flow and JSDoc…

e9a5713

… to useLifecycleActions

rlinoz previously approved these changes Apr 15, 2026

View reviewed changes

Remove unnecessary checkForNecessaryAction from onPaymentSelect

d02a6af

TMisiukiewicz dismissed rlinoz’s stale review via d02a6af April 15, 2026 13:44

rlinoz approved these changes Apr 15, 2026

View reviewed changes

rlinoz merged commit 1d7d446 into Expensify:main Apr 15, 2026
44 of 58 checks passed

github-actions Bot mentioned this pull request Apr 15, 2026

Investigate workflow job failing on main: chooseDeployActions #87983

Closed

OSBotify mentioned this pull request Apr 16, 2026

Deploy Checklist: New Expensify 2026-04-16 #88022

Closed

lanitochka17 mentioned this pull request Apr 16, 2026

Expense - Unable to retract exported report when Approvals and Payments are disabled #88098

Closed

7 tasks

rlinoz mentioned this pull request Apr 16, 2026

[CP Staging] Revert "Extract secondary action hooks and components from MoneyReportHeader" #88105

Merged

Conversation

TMisiukiewicz commented Apr 8, 2026 • edited by mountiny Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

Uh oh!

codecov Bot commented Apr 8, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

TMisiukiewicz commented Apr 8, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

abzokhattab commented Apr 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TMisiukiewicz commented Apr 15, 2026

Uh oh!

abzokhattab commented Apr 15, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

abzokhattab left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Apr 15, 2026

Uh oh!

github-actions Bot commented Apr 15, 2026

Uh oh!

OSBotify commented Apr 15, 2026

Uh oh!

OSBotify commented Apr 16, 2026

Uh oh!

MelvinBot commented Apr 16, 2026

Uh oh!

lanitochka17 commented Apr 16, 2026

Uh oh!

OSBotify commented Apr 21, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

TMisiukiewicz commented Apr 8, 2026 •

edited by mountiny

Loading

codecov Bot commented Apr 8, 2026 •

edited by github-actions Bot

Loading

abzokhattab commented Apr 14, 2026 •

edited

Loading